From: Dan Winship <danw@gnome.org>
Date: Tue, 30 Jun 2009 21:29:40 +0000 (-0400)
Subject: Set GCONF_DEFAULT_SOURCE_PATH from the gnome-shell wrapper script
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~11249
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a5e3227b64a69ec2925ca0fbadabff0f4e4dd038;p=gnome-shell.git

Set GCONF_DEFAULT_SOURCE_PATH from the gnome-shell wrapper script

Needed so that a jhbuilt gnome-shell can find its schemas at runtime
---

diff --git a/src/Makefile.am b/src/Makefile.am
index e0aab00a7..e752ffa3f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,6 +14,7 @@ gnome-shell: gnome-shell.in
 	    -e "s|@libexecdir[@]|$(libexecdir)|" \
 	    -e "s|@libdir[@]|$(libdir)|" \
 	    -e "s|@pkgdatadir[@]|$(pkgdatadir)|" \
+	    -e "s|@sysconfdir[@]|$(sysconfdir)|" \
 	    $< > $@ && chmod a+x $@
 CLEANFILES += gnome-shell
 EXTRA_DIST += gnome-shell.in
diff --git a/src/gnome-shell.in b/src/gnome-shell.in
index 96c14ec09..f1d5e0ba4 100755
--- a/src/gnome-shell.in
+++ b/src/gnome-shell.in
@@ -141,6 +141,10 @@ def start_shell():
         env.update({'GNOME_SHELL_DATADIR' : data_dir,
                     'GI_TYPELIB_PATH'     : typelib_dir})
 
+    jhbuild_gconf_source = os.path.join('@sysconfdir@', 'gconf/2/path.jhbuild')
+    if os.path.exists(jhbuild_gconf_source):
+        env['GCONF_DEFAULT_SOURCE_PATH'] = jhbuild_gconf_source
+
     # Work around Ubuntu xulrunner bug,
     # http://bugzilla.gnome.org/show_bug.cgi?id=573413
     pkgconfig = subprocess.Popen(['pkg-config', '--variable=sdkdir', 'mozilla-js'],